Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 19 Jul 2010 11:26:46 +0000 (11:26 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 19 Jul 2010 11:26:46 +0000 (11:26 +0000)

Trivial merge